bitkeeper revision 1.1071.1.6 (40f4dc820j_moO3D2AEja33QFn9N7A)

Tiny fixes to allow gentoo distro to work in dom0.

diff --git a/tools/examples/init.d/xend b/tools/examples/init.d/xend
index bf1cc93e3db7eab7fde91452d3ac6624d5d1c703..b0cbe96612f90020f06279852cfc42b8a5708430 100755 (executable)
--- a/tools/examples/init.d/xend
+++ b/tools/examples/init.d/xend
@@ -7,7 +7,7 @@
 # chkconfig: 2345 99 00
 # description: Starts and stops the Xen control daemon.
 
-. /etc/init.d/functions
+. /etc/init.d/functions || . /etc/init.d/functions.sh
 
 case "$1" in
   start)

diff --git a/tools/python/xen/xend/XendRoot.py b/tools/python/xen/xend/XendRoot.py
index f0223896955df1401b6f3869006822168ff36c32..891cf0cea6be1874a091f1740c7b0bd31ae31472 100644 (file)
--- a/tools/python/xen/xend/XendRoot.py
+++ b/tools/python/xen/xend/XendRoot.py
@@ -17,7 +17,7 @@ import sxp
 def reboots():
     """Get a list of system reboots from wtmp.
     """
-    out = os.popen('/usr/bin/last reboot', 'r')
+    out = os.popen('last reboot', 'r')
     list = [ x.strip() for x in out if x.startswith('reboot') ]
     return list